From b38d9cec6bb91c8de26c194176eb1cfb8db9d77a Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 26 Jun 2007 22:26:29 +0000 Subject: [PATCH] Fix a typo in the previous commit. 2007-06-26 Emmanuele Bassi * gtk/gtkfilechooserdefault.c (list_mtime_data_func): Fix a typo in the previous commit. (shortcuts_append_desktop): Remove unused variable and hush the compiler warning. svn path=/trunk/; revision=18249 --- ChangeLog | 8 ++++++++ gtk/gtkfilechooserdefault.c | 14 ++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c10eb4d1ec..42e3dc8c8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-06-26 Emmanuele Bassi + + * gtk/gtkfilechooserdefault.c (list_mtime_data_func): Fix + a typo in the previous commit. + + (shortcuts_append_desktop): Remove unused variable and + hush the compiler warning. + 2007-06-26 Emmanuele Bassi * gtk/gtkfilechooserdefault.c (list_mtime_data_func): Show diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 0baec77297..96063a72e8 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1955,8 +1955,7 @@ shortcuts_append_home (GtkFileChooserDefault *impl) static void shortcuts_append_desktop (GtkFileChooserDefault *impl) { - char *name; - const char *home; + const char *name; GtkFilePath *path; profile_start ("start", NULL); @@ -10971,12 +10970,16 @@ list_mtime_data_func (GtkTreeViewColumn *tree_column, if (!ptm) { - date_str = g_strdup (_("Unknown")); g_warning ("ptm != NULL failed"); - goto done; + + g_object_set (cell, + "text", _("Unknown"), + "sensitive", sensitive, + NULL); + return; } else - memcpy ((void *) &tm, (void *) ptm, sizeof (struct tm)); + memcpy ((void *) &tm_mtime, (void *) ptm, sizeof (struct tm)); } #endif /* HAVE_LOCALTIME_R */ @@ -11005,7 +11008,6 @@ list_mtime_data_func (GtkTreeViewColumn *tree_column, date_str = g_strdup (_("Unknown")); } -done: g_object_set (cell, "text", date_str, "sensitive", sensitive, -- 2.30.2